From 343e47729510c8a72f1496f19d7a601d6fe92954 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Fri, 5 Sep 2008 19:09:24 +0000 Subject: [PATCH] gbfile: Tweak unicode check 'gbfunicode'. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3448 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/gbfile.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gpsbabel/gbfile.c b/gpsbabel/gbfile.c index 554c4b641..83a87dd73 100644 --- a/gpsbabel/gbfile.c +++ b/gpsbabel/gbfile.c @@ -938,25 +938,24 @@ gbfunicode(gbfile *file) file->unicode_checked = 1; + pos = gbftell(file); + gbfrewind(file); + c = gbfgetc(file); if (c == EOF) return 0; if ((c != 0xFE) && (c != 0xFF)) { - gbfungetc(c, file); + if (pos) gbfseek(file, pos, SEEK_SET); return 0; } - - pos = gbftell(file); - gbfrewind(file); c = c | (gbfgetc(file) << 8); if (c == 0xFEFF) file->big_endian = 0; else if (c == 0xFFFE) file->big_endian = 1; else { - gbfseek(file, pos, SEEK_SET); + if (pos) gbfseek(file, pos, SEEK_SET); return 0; } - file->unicode = 1; if (pos != 0) gbfseek(file, pos, SEEK_SET); } -- 2.30.2